Don't crash if end_run is not set. (#424168, Matthias Hasselmann)

2007-04-25  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkprintoperation.c (preview_iface_end_preview): Don't
        crash if end_run is not set.  (#424168, Matthias Hasselmann)

svn path=/trunk/; revision=17636

diff --git a/ChangeLog b/ChangeLog
index 9d2e01b829995078475f03cac5bd9f30e1ff2369..b343ae3c679187d24d6d2cc229e8457312870772 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkprintoperation.c (preview_iface_end_preview): Don't 
+       crash if end_run is not set.  (#424168, Matthias Hasselmann)
+
 2007-04-25  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkmenu.c (gtk_menu_handle_scrolling): fix ACTIVE state of

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index d40465b04b543473b909b114c3a08c7513b19fd5..c04abbc4313664e96f4501d12beb5a1b6376d84e 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -186,8 +186,9 @@ preview_iface_end_preview (GtkPrintOperationPreview *preview)
 
   if (op->priv->rloop)
     g_main_loop_quit (op->priv->rloop);
-
-  op->priv->end_run (op, op->priv->is_sync, TRUE);
+  
+  if (op->priv->end_run)
+    op->priv->end_run (op, op->priv->is_sync, TRUE);
   
   g_signal_emit (op, signals[DONE], 0,
                 GTK_PRINT_OPERATION_RESULT_APPLY);